Removed redundant code.
Updated linux build