Remove unused method
Add macro for struct