removing hard coded dependencies