Clean up files
Try to add oauth support