Started the process of removing Info classes