fix whitespace, delete obselete code