code clean up; remove unused methods