Cleaned up files included w/ components