Updated before removal
Removed some older references