got rid of redundant stuff