Removing white spaces and map unused code.