Big clean up (Removed all syso's and deleted some unused code)