Code / import cleanup