Eliminated Second Puzzle

I got rid of the second puzzle to simplify the game, cleaned up some
transitions, and also finished up the dialogue puzzle.