Updates for cleanness and other fun things.
Removing old file.