whitespace removal
removed useless legacy code