Remove self where it's not needed