removed pointless fragments of code