Cleaned out static and app