cleaned up old cruft