Added whitespaces removal.
Removed old file