Removed all unnecessary code