Removed unwated code