Revert "Some Model Classes"

This reverts commit ed0a189fea5f746388ca98668f33eba54d9a128b.