Added TODO [ci skip]
Updated maintenance script [ci skip]