Cleaning up last commit; possibly fixed despawning issues