deleted some redundant code