Cleanups - remove extraneous else