cleaned up file and removed useless code.