Updating to the latest working code and removing non-generic modules