Remove alias stuff, whitespace