Remove macro special form
Add macro macro
Prepare for heroku