Remove some static stuff