further cleanups - this time customizations