fixed static imports, removed unused field