Base: Finish cleaning up