Whitespace and unused files cleanup