legacy code removed, more spock