Removed usless elements for redesgin