Removed depedency to brick-common