OS check removed