Removed useless components