Fixed keywords not being cleaned up as intended.