Cleaned up some dependencies 4_02