Remove outdated waiter class. Update filesystem behavior.