[TASK] Some initial cleanup