Added usesTrait and aliases annotations to M3, removed some unused code