remove compatibility check