Removing legacy module refs