some cleanup

some cleanup of code and prefabs