Removed static variable call