removed comments and test code