Even further cleanup