Cleanup

some cleanup