More clean up from dev work