Fixes titles and removes unused constants