Ripping out proprietary goop