Removed some lines that should be on the oneline branch