Removed LWDAQ
Cleaned up headers