some cleanup
remove silly macro