Get rid of Altwick + do Whitespace