Cleaned up prefab classes