remove & rename methods