Deletion unused class and some others features (don't remenber which)