Remove unused path methods, still made sure tests all green
Remove tests for unused paths, fix some pending tests