General Cleanup

General Cleanup