removed unuseful things
met corrected
removed unuseful ifdef