Removed now deprecated code and temporarily editted out some stuff to avoid failing all sanity checks