removing not used code
needs to be naturaly sorted to be in correct order
clean up code