Some additional clean up