Removing old, dead, unused code