Starting to clean of for first alpha release