remove defined check that was not working