prefab cleanup
prep work for new features