Cleaned up default app