minor edits, removed unused files