Micro cleanup