tooling updates, removing unneeded code