Clean Analysis phase with new extended class