Removed bin and gen plus unused imports