Removed macro calls