Remove @property abuse