bugfix and rm extra files