Fix bug 57; remove keystone reference