Added checks to content
Removed unused elements