Removed or commented-out non-essential bits