redundant code clean up