Cleanup in initial code