got rid of some useless stuff