Clean up compiler warnings / unused imports