Some initial cleanup