remove duplicate code that was failing the tests
remove duplicate code that was failing the tests

advancedlogic/GoOse,Smarp/GoOse,advancedlogic/GoOse,quipo/GoOse,advancedlogic/GoOse,quipo/GoOse,Smarp/GoOse,quipo/GoOse