got rid of unused methods