A Few final code cleanup things, calling it done now