removed unused code (we need to do this right)