Further deleting, initial load WAY faster