General cleanup and imports