several changes, removed unnecessary files