whitespace cleanup & remove obsolete code