[TASK] Requires 6.0 now, cleanup of code and comments