Cleanup for testing on Laptop