Revert "broken version after trying lots of bug fixing"

This reverts commit cf316a2f5c5a63ae56c95e254b3e1d871a5128fc.
Cleaned up

but still doesn't have HW2 or HW3 changes. Still, it's a stable version.