remove instanceof
cleanup