Removed static variables