Remove dead method
Clean up