Remove unused macros
Put Binding in its own class