Remove un-needed variables and parameters