Removed unused Code