Remove these from the code file