Revert "Revert "removed pointless functions, added macro""

These are pointless functions.