cleanup
created entities
version alpha 1