Removed unnecessary Puddle stuff.