Do not collect rent from ourselves
Code cleanups