Initial alpha testing clean up