Some old classes cleanup. Text rendering added