remove a lot of commented code