remove macro stuff