Removing mode as variable