Removed old code
Getting ready to merge back into dev.