Changed tabs into spaces
Removed deprecated upgrade hack