SimpleBase code clean up