Clearing points now mostly works