[Cleanup] General cleanup