Removes Celluloid as dependency