Removed the some overdone work