Removed modules

Change-Id: I514010e50de31ab49a6674fb3e70a017616c8c8b