Removed unecessary code, starting to implement persistant tables.