remove superfluous classes
update tests
additional documentation
clean up User queries
cleanup queries