Removed commented code which is imho not needed (still needs tests ofc)