removed 2 define lines that where commented out anyway