reduced method ambiguouity, removed unused code