Changes to remove unused code and improve metrics