cleanup unused imports and methods
fixed pupil deletion #1