Remove and fix comments