change comments, remove unused code