Removed Granite dependency