Cleanup org.cpp