Some code cleanup
Remove unused stuff