rename fields .. remove unused classes