Winter Clean up

Currently EDX functionen calls various functions not included in the packages (and potentially not needed). For example it calls edx_funcs and thresholds. Regarding thresholding this will be a task for Rasmus - so just don't focus on it