Commenting out broken code for now.
Fixing alias resolving logic.