flatten class and delete unused codes
connectometry update