cleaned up proprietaries