Got rid of unused, old code