removed some redundant stuff