Remove obsolete control
Remove obsolete types