Removed static stuff