ISLANDORA-27 Removed ineffective OS-check. Cleaned up comments.