Minor stylistic cleanups and removing unused extensions