Cleaning up file + removed useless code.