Quick cleanup 1