Removes redundant use statements, fixes identity bug. fixes #15