[noticket] Code cleanup