Cleanup of secret stuff :P