ctrl and ctrl_dev integration done and more cleaning