Cleaned up some init phase classes