Removed constant dependencies