Removal of controls library caused some issues