Fixed dependencies. Began to remove dependency on TerrainControl.