#82 Clean wallet functionality