Removed deadcode and whitespace