remove a bit of redundant code