remove uncessary defined? check