some cleanup
make it compile normally