Removed unnecessary code blocks. Can more reliably provide backwards compatibility by using comment blocking.