Rework flow to not use grunt