Remove alias module to make things simpler