Major cleanup

Change-Id: I6afcf66c5ead2d8107f981721cff12a58b600035