Commenting changes and removed the support library dependencies.