diff --git a/internal_data/captcha/.keep b/internal_data/captcha/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/library/config.php b/library/config.php
index 79e827578..0065059cc 100644
--- a/library/config.php
+++ b/library/config.php
@@ -72,7 +72,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Version info
 $bb_cfg['tp_version'] = '2.1.6';
-$bb_cfg['tp_release_date'] = '14-12-2014';
+$bb_cfg['tp_release_date'] = '20-12-2014';
 $bb_cfg['tp_release_state'] = 'ALPHA';
 $bb_cfg['tp_zf_version'] = '2.3.3';
 
@@ -127,7 +127,6 @@ $bb_cfg['cache']['engines'] = array(
 	'bb_config'     => array('filecache', array()),
 	'tr_cache'      => array('filecache', array()),
 	'session_cache' => array('filecache', array()),
-	'bb_cap_sid'    => array('filecache', array()),
 	'bb_login_err'  => array('filecache', array()),
 	'bb_poll_data'  => array('filecache', array()),
 );
diff --git a/library/includes/api/sphinx.php b/library/includes/api/sphinx.php
index ea9fa86fd..68b29869e 100644
--- a/library/includes/api/sphinx.php
+++ b/library/includes/api/sphinx.php
@@ -18,8 +18,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__));
 /////////////////////////////////////////////////////////////////////////////
 // PHP version of Sphinx searchd client (PHP API)
 /////////////////////////////////////////////////////////////////////////////
-if(!class_exists('SphinxClient')) 
-{
+
 /// known searchd commands
 define ( "SEARCHD_COMMAND_SEARCH",	0 );
 define ( "SEARCHD_COMMAND_EXCERPT",	1 );
@@ -1648,7 +1647,7 @@ class SphinxClient extends cache_common
 		return $res;
 	}
 }
-}
+
 //
 // $Id: sphinxapi.php 2055 2009-11-06 23:09:58Z shodan $
 //
\ No newline at end of file
diff --git a/library/includes/functions.php b/library/includes/functions.php
index 7312d090b..effcaa7b1 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -2214,7 +2214,7 @@ function init_sphinx ()
 
 	if (!isset($sphinx))
 	{
-		require(INC_DIR .'api/sphinx.php');
+		if (!class_exists('SphinxClient')) require(INC_DIR . 'api/sphinx.php');
 		$sphinx = new SphinxClient();
 
 		$sphinx->SetConnectTimeout(5);
diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index 1ff44ee8a..0b2997612 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -429,8 +429,6 @@ require(INC_DIR .'sessions.php');
 require(INC_DIR .'template.php');
 require(CORE_DIR .'mysql.php');
 
-define('SQL_LAYER', 'mysql');
-
 $bb_cfg = array_merge(bb_get_config(BB_CONFIG), $bb_cfg);
 
 $user = new user_common();