LCD code was still running, added more ifdef's