Inner clean up time!

|Inner clean up time!