FIX: Off by one error in the fixed list (Philip)
CODE: Remove unused function in the fixed list