General cleanup of imports etc