small refractor - removed unused methods