Tidy up, remove features that has been merged