Some clean up by pahi