Fixed a few things in System, removed some not needed stuff.