Removed other singleton variables