Refactored code & removed unused content.

Refactored code & removed unused content.