removed some unused Code