removed unneeded #/definitions