Further cleaning up of extensions