[misc] Yet some more cleaning here and there...