Removing unnecessary dependenceny