remove ellipses and old code