more stealy aliases, cleanups