Fix namespace usage
Remove unused scheduler