Removed some jQuery in order to improve performance