Got rid of unnesc. code