Removal of a setting change used for debug purposes + code modification to avoid warnings related to using a weak property