Simplify the recipes and remove unused variables Signed-off-by: Vaibhav Gupta <vaibhav.gupta@cern.ch>