Removed dev .only and console.logs