Cleanup of temporary code