Minor cleanup for succubus