Cleaned and removed unnecessary code.