Remove redundant imports

Also enforce no new ones via Checkstyle