OSNG-209 Cleanup