Cleanup and More Base Work