Remove un-needed stuff