Removed area.h and volume.h