Removed useless states