Cleaned up experimental stuff