Remove un-needed things