got rid of redundant macro