Removed debugging part of this module