Remove hacks, integrate into program