// Cleaned js calls