minor change
minor rename
removed unused methods