Clean up star imports