Removed some of the cruft from this module