Remove deprecated code
Remove Markaby plugin and use gem instead
Missed committing in upgrade