Finished removal of dice2...again #18