deleted pass, few unused methods
refactor