Cleaned up static and app