Removed some of the defunct/old code