Removed grading and drag'n'drop

@srpearce , please take a look.