Cleanup, removing deprecated code