Before cleaning up %.%