Optimize imports, remove statistics constants