Cleanup code base