Silence warnings, remove redundancies, cleanup