Removing a few convenience functions from arbitrary module. They could be badly abused.