Phase 3 of changes from feature/modules_integration

Clean up extra print statement.