cleanup, removed various interfaces, renamed some types