remove unnessary defines + cleanup comments