Removed deprecated code and commented out large chunk of it for future review.