Cleanup/remove unneeded code.

also testing pull requests