Bug fixes

also deleted unused project