[feat/organization] Clean up js and php