Fixing build issues and removing unnecessary titles