Removing the single value modules (for now)