Removed unused/backup code