remove unused handler
rename vars
dont need to "new" these
don't need to pass in context
i dunno