Removed some code around release macros that already did the exact same thing