#62 Remove obsolete return button implementation