Some very idiotic code will be gone soon