remove unnecessary check
Clean up a bit, fix errors