Revert "Cleanup more useless info"

This reverts commit f2267e484c260a621dd2a92b7c3243e4aea37191.