removed comments and unused code