Removing hard dependencies