Update CHANGELOG and remove un-used views