Removed wrongly placed components...