Even more general cleanup