cleanup
added User entity