Remove stuff made redundant by move to UUIDs instead of file based ID