Merge "Removed unused code from src/kernel/."