removed redundant imports and shadowing declarations
added warnings to default build