Remove some static imports