removing hardcoded dependancies