Removed old code
Fixed Merege Conflicts