Remove using static imports