Remove draft related stuff from controller/form handler