Removed static references