removing some pointless stuff