Removed a few unnecessary selfs.