delete excess code and minor edits