Removed all unnecessary static referances, using a new 'Data' class
system