Removed rest of explicit dependencies

Some other minor conversion by hand