Deleted deprecated code
Code reformat