removed some redundant statements