Removed unused content, cleanup up docs
Move out more redundant code