Clean up imports and make constants compatible with Breeze