Revert "Need that"

This reverts commit 8df625fcc163c28ab21ba1b115bcb428ba4b712e.
Revert "Some fixes and clean up."

This reverts commit 5424d0a9af99fe7cc02757878c458c74f04f09fb.