Simplified sample a bit
Removed unused classes