Remove some unneeded code post-review