Cleaning up explicit dependencies