Final Revision 
Review comment
Remove not used class & method