removed static stuff from samples