Fixed some pupilRemove logic

pupilRemove is still extremely broken