Minor clean up task