Merge "BUG 428 remove importing unnecessary imports"