some initial cleanup