Removed stuff that's not for Pyvot