Old administration removes and spec fixes