code cleanup : removed unused parts of code