removed all the bad code