Remove that thing I did before creating a test

Bad programmer! No cookie!
Copy changes
Bump version
formatting
Make models the holders of many class methods
Remove unused method
Make it data_params