Remove unnecessary stuff...