Remove two extra imports