Remove some unused declarations and tables