Removed old code, more changes