remove obsolate classes
remove obsolate classes
make build state independent
make build state independent