replace more bind's with lambdas
removed no longer needed using clauses