Removing function dependencies