Remove un-needed