Removed deprecated code and modified a few little things.