We work with tank-less water heaters as well  -  should they prove to be a good option for you. Our services include hauling away of the old unit. Call us or email us for a quote.