remove unused code. fix comments, header.