Removed more js func