Remove duplicated Rbx specific code