got rid of some pointless stuff