Fixed rating forms / cleaned up unused code