Remove aliases creation. Make fixes in code according to @tadatuta notations