Remove unneeded selfs
Merge pull request #3 from lloydmeta/refactor/remove_unneeded_selfs

Remove unneeded selfs