Version 1.4 update

Updated Affliction to improve CD usage and removed redundant and
obsolete code.