Removed some unused classes, got rid of all primitive arrays