Cleaning up code, removing some debug strings.