uh, some cleanup apparently, no idea what I was doing here