Finished basic cleanup