removed pointless functions, added macro

same as last commit.