Removed debug print_r's