Removing reminants of old code