remove unused method and a small tweak