[TASK] Do some more cleanup