Removing Amethyst dependency.