Removed unused code #3