Take out more unnecessary stuff