Removed unnecessary elemntens and methods