Cleaned up and simplified the less needed stuff.

Left the most important.