removed "-core" from script names
removed unused variables
fixed some syntax errors

Change-Id: I74cd52e33375bf0afabcae98590aede6bdc57793