Removed all extra code