General cleanup. Prepare for comet