New conductor build
Code cleanup