Comment out sample stuff for now