Usings and references clean-up