Removed commented code and fixed @GGraca's test commit.