Removed stuff that won't be included in 0.2.1