OOIION-708 cleans up site data processes