Removed some code that wasn't needed + event mobile fix