Fixed requirements and init cleanup