removed the noofs

plus some other copy/rename stuff