Removed unnecessary stuff v1