cleanup
clean up psi methods
initial resolving