Removed some redundent Component includes and fixed a missing
logic operator