Work on cleanup and GD