removed some redundant stuff from last commit