This is cleanup after recent changes