remove uncalled methods
remove unused entity maps