Clean up
Remove useless method