Removed an unnecessary dependency, and cleaned up initial file landing.