Remove line
Fix up comments