Remove unnecessary & Add databases relations