code cleaning - unused methods removed