Did some Cleanup