Fixing terrible non-building code