eliminate some code phunk