Commenting fixed, deprecated code removed