Deleted some non-functioning