[BUGFIX] Restore custom file info and code clean up

Change-Id: Ia18769d062994ddc7bffab2142543c96eafdaa9a