Task 229 fixed tracked behavior for rails 4, removed deprecated code