removed some pointless stuff