Removing deprecated code (#7)