[TASK] clean up old code