Removed redundant platform specific code

#1908