Remove unnecessary parameter from init() call, remove old @TODO annotation