Remove obsolete stuff that make dirty logcat