Removed old code we didn't need anymore