Removed stuff in __init__ - shouldn't really need it.