Pre-merge: removed mouse init