Removed grading and drag'n'drop