Cleanup, oursources inner classes