Removed Unuesed entities
Fixing References