CLEAN: Cleanup DEPRECATED code