Removed all static imports