Fixed Warnig message and removed..

Fixed Warnig message and removed unessesary code and changed != to == for better detection!