Removed old code based on #ifs (issue #55)