remove dependency on aquarium