Deleted nasty Code