Removing deprecated code and fixing templates