Minor cleanup of imports and static methods accessed non-statically