Merge request.

Most previous commits already applied previously.
Just remove everything that is not needed and that you do not foresee to be needed in the near future. We have version control to get it back if needed.