Remove not used class,
Add more error handle.