Hardcore cleanup & add