removed mouse interaction and some cleanups