Cleaned up includes
Modified Secret key func to use new hash functions