Remove un-needed variables