Remove unnecessary stuff vs suggested