cleaned up redundant