Cleanup

+ More coin management code