removed unreferenced stuff