Updated felix with the clean up fix