Modified code to my own system, removed old code