Remove unneeded bower components, refactor some