removed pointless stuff