removing old code and comments