Forgot to kill some unnecessary stuff