Removed some technical debt.