Cleanup from issue2