Removed unnecessary packages. Will re-add if they become necessary once more
Minor improvements