Add broken signature generator, clean up imports
keep travis happy