Fixed methods and removed group references where necessary.