Some cleanup of finished methods