fix #7

finished deleting all old code