Removed unused states in .h files