RTCL Cleaning useless code