Bunch of cleanups

Tiago Gomesrequested to merge
tiagogomes/some-cleanups into master

Description

Bunch of cleanups steamed from !671 (closed)

Merge request reports