Removed unnecessary components