some work on keys, deleted unused assets