Changed URLs, removed some unnecessary code.