Clean up implementation

Import fixes by Nuha