get rid of some duplicate stuff