Last initial cleanup