Setup fixing

Spring cleaning