Clean build with the implementation of Strategy-1 and 2