Cleanup of administration / change according to teacher's feedback