Removed some methods in the tools module that were not needed anymore.