Remove useless self reference
Miscellaneous cleanups