Remove old long press handler and cleanup