* Removing obsolete components
* Replacing spaces with tabs