Removed indices and tables that dont seem to work