Remote unneeded #ifdef's
Rename self variables