Final cleanup (fingers crossed), should be ignored now