removed definitions, they are now in the header file