Code Cleaning: removed unused code