cleanup
Revert "3.10.40 merge fixes"

This reverts commit 6337a57211dc1d979674f2b8e249339434de4734.
Revert "merge in more 3.10.40 better still sod"

This reverts commit 8e2dee3f71efd28d328a2a7ce4cfa39bebc25d03.
Revert "sleep fix test - better not more freezing? but not sleeping"

This reverts commit 7cddaf20f135bf18209232ca8b597725cfda160e.
Revert "SOD Fix test"

This reverts commit 20df62c5add564a287c082412bb7ad7485f9c0c6.
Revert "merge in 3.10.40 suspend code"

This reverts commit 9e9a996b9c7104c670f2bbae3c21fc75696c24df.
Revert "Increase FB size"

This reverts commit bc46c0318c82db1a371d96e219878e68efec92cf.