Fixed conflicts
Structure members are cleaned up when using inline function replacement