Remove old edit key stuff