Some changes after codereview
Delete redundant classes