- overall cleanup :
 * removed obsolete code , comments