-- remove stupid stuff...