Remove unnecessary stuff and improve other