Dev comments cleanup