remove test and commented code