Removing unneeded components and making it work smoother