Got rid of some static stuff in code