removed some plumbing