additional cleanup and getting dependencies to work again...