cleaned up more prefab stuff