Original commit
Start removing unnecessary things
Merge commit '96f6624be1dcecb8579b6186cf54b08cdf80c881'