Dropped old code, fixed error from merge