Removed some unused Code