Continuing to clean up the various modules