Removed unneeded code
tidy
Fixed relationship issues