removed unused files, updated keyspace generation