cleanup for andrewww