Merge "cleanup dev option"